From 0747f6e56ec0c2a019f6c76cadb34feca6e0f103 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Fri, 18 Jan 2008 16:09:05 +0000 Subject: [PATCH] do_set_trap_table()'s argument can be const. Also, automatically generate const version of every guest handle definition. Signed-off-by: Jan Beulich Signed-off-by: Keir Fraser --- xen/arch/ia64/xen/hypercall.c | 2 +- xen/arch/x86/traps.c | 2 +- xen/arch/x86/x86_32/traps.c | 2 +- xen/arch/x86/x86_64/traps.c | 2 +- xen/include/asm-x86/hypercall.h | 2 +- xen/include/public/arch-ia64.h | 4 +++- xen/include/public/arch-powerpc.h | 3 ++- xen/include/public/arch-x86/xen.h | 3 ++- xen/include/public/xen.h | 1 - 9 files changed, 12 insertions(+), 9 deletions(-) diff --git a/xen/arch/ia64/xen/hypercall.c b/xen/arch/ia64/xen/hypercall.c index 33e61b4052..c2879f7c9a 100644 --- a/xen/arch/ia64/xen/hypercall.c +++ b/xen/arch/ia64/xen/hypercall.c @@ -454,7 +454,7 @@ static long unregister_guest_callback(struct callback_unregister *unreg) /* First time to add callback to xen/ia64, so let's just stick to * the newer callback interface. */ -long do_callback_op(int cmd, XEN_GUEST_HANDLE(cvoid) arg) +long do_callback_op(int cmd, XEN_GUEST_HANDLE(const_void) arg) { long ret; diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 8cc33eb1a2..479376faed 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2825,7 +2825,7 @@ long unregister_guest_nmi_callback(void) return 0; } -long do_set_trap_table(XEN_GUEST_HANDLE(trap_info_t) traps) +long do_set_trap_table(XEN_GUEST_HANDLE(const_trap_info_t) traps) { struct trap_info cur; struct vcpu *curr = current; diff --git a/xen/arch/x86/x86_32/traps.c b/xen/arch/x86/x86_32/traps.c index 0106081cdd..d0f8637649 100644 --- a/xen/arch/x86/x86_32/traps.c +++ b/xen/arch/x86/x86_32/traps.c @@ -419,7 +419,7 @@ static long unregister_guest_callback(struct callback_unregister *unreg) } -long do_callback_op(int cmd, XEN_GUEST_HANDLE(cvoid) arg) +long do_callback_op(int cmd, XEN_GUEST_HANDLE(const_void) arg) { long ret; diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 3cf5359fdc..47a0d805f0 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -470,7 +470,7 @@ static long unregister_guest_callback(struct callback_unregister *unreg) } -long do_callback_op(int cmd, XEN_GUEST_HANDLE(cvoid) arg) +long do_callback_op(int cmd, XEN_GUEST_HANDLE(const_void) arg) { long ret; diff --git a/xen/include/asm-x86/hypercall.h b/xen/include/asm-x86/hypercall.h index 374f995aa6..508cce6191 100644 --- a/xen/include/asm-x86/hypercall.h +++ b/xen/include/asm-x86/hypercall.h @@ -34,7 +34,7 @@ do_physdev_op_compat( extern long do_set_trap_table( - XEN_GUEST_HANDLE(trap_info_t) traps); + XEN_GUEST_HANDLE(const_trap_info_t) traps); extern int do_mmu_update( diff --git a/xen/include/public/arch-ia64.h b/xen/include/public/arch-ia64.h index ba976cfb01..e4cf73fc17 100644 --- a/xen/include/public/arch-ia64.h +++ b/xen/include/public/arch-ia64.h @@ -36,7 +36,9 @@ #endif #define __DEFINE_XEN_GUEST_HANDLE(name, type) \ - ___DEFINE_XEN_GUEST_HANDLE(name, type) + ___DEFINE_XEN_GUEST_HANDLE(name, type); \ + ___DEFINE_XEN_GUEST_HANDLE(const_##name, const type) + #define DEFINE_XEN_GUEST_HANDLE(name) __DEFINE_XEN_GUEST_HANDLE(name, name) #define XEN_GUEST_HANDLE(name) __guest_handle_ ## name #define XEN_GUEST_HANDLE_64(name) XEN_GUEST_HANDLE(name) diff --git a/xen/include/public/arch-powerpc.h b/xen/include/public/arch-powerpc.h index 0819659e31..be668baec2 100644 --- a/xen/include/public/arch-powerpc.h +++ b/xen/include/public/arch-powerpc.h @@ -32,7 +32,8 @@ } __attribute__((__aligned__(8))) __guest_handle_ ## name #define __DEFINE_XEN_GUEST_HANDLE(name, type) \ - ___DEFINE_XEN_GUEST_HANDLE(name, type) + ___DEFINE_XEN_GUEST_HANDLE(name, type); \ + ___DEFINE_XEN_GUEST_HANDLE(const_##name, const type) #define DEFINE_XEN_GUEST_HANDLE(name) __DEFINE_XEN_GUEST_HANDLE(name, name) #define XEN_GUEST_HANDLE(name) __guest_handle_ ## name #define set_xen_guest_handle(hnd, val) \ diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h index 72c13837b4..0638901b1f 100644 --- a/xen/include/public/arch-x86/xen.h +++ b/xen/include/public/arch-x86/xen.h @@ -37,7 +37,8 @@ #endif #define __DEFINE_XEN_GUEST_HANDLE(name, type) \ - ___DEFINE_XEN_GUEST_HANDLE(name, type) + ___DEFINE_XEN_GUEST_HANDLE(name, type); \ + ___DEFINE_XEN_GUEST_HANDLE(const_##name, const type) #define DEFINE_XEN_GUEST_HANDLE(name) __DEFINE_XEN_GUEST_HANDLE(name, name) #define __XEN_GUEST_HANDLE(name) __guest_handle_ ## name #define XEN_GUEST_HANDLE(name) __XEN_GUEST_HANDLE(name) diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h index 52c61a2eb3..a3b1d2fc3f 100644 --- a/xen/include/public/xen.h +++ b/xen/include/public/xen.h @@ -48,7 +48,6 @@ __DEFINE_XEN_GUEST_HANDLE(uint, unsigned int); DEFINE_XEN_GUEST_HANDLE(long); __DEFINE_XEN_GUEST_HANDLE(ulong, unsigned long); DEFINE_XEN_GUEST_HANDLE(void); -__DEFINE_XEN_GUEST_HANDLE(cvoid, const void); DEFINE_XEN_GUEST_HANDLE(xen_pfn_t); #endif -- 2.30.2